Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 9 Jun 2010 22:49:43 +0000 (22:49 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 9 Jun 2010 22:49:43 +0000 (22:49 +0000)

Trivial merge